feat(l2): implement batch endpoint #3374

avilagaston9 · 2025-06-27T20:52:55Z

Motivation

For debugging purposes, it's useful to have an ethrex_getBatchByNumber endpoint that returns a Batch struct:

pub struct Batch {
    pub number: u64,
    pub first_block: u64,
    pub last_block: u64,
    pub state_root: H256,
    pub deposit_logs_hash: H256,
    pub message_hashes: Vec<H256>,
    pub blobs_bundle: BlobsBundle,
    pub commit_tx: Option<H256>,
    pub verify_tx: Option<H256>,
}

Description

Modifies the Batch struct to incude commit_tx and verify_tx.
Updates block_fetcher to process verify tx logs and extract the verify tx hashes as well.
Fixes a bug found during development: the rollup_storage::getBatch() function incorrectly treated batches without L1Messages as an error.

How to test

You can run:

curl -X POST http://localhost:1729 \
  -H "Content-Type: application/json" \
  -d '{
    "jsonrpc":"2.0",
    "method":"ethrex_getBatchByNumber",
    "params": ["0x1", true],
    "id":1
  }'

Closes None

github-actions · 2025-06-27T20:54:54Z

Lines of code report

Total lines added: 392
Total lines removed: 0
Total lines changed: 392

Detailed view

+----------------------------------------------------+-------+------+
| File                                               | Lines | Diff |
+----------------------------------------------------+-------+------+
| ethrex/cmd/ethrex/l2/command.rs                    | 451   | +2   |
+----------------------------------------------------+-------+------+
| ethrex/crates/common/types/batch.rs                | 16    | +4   |
+----------------------------------------------------+-------+------+
| ethrex/crates/l2/based/block_fetcher.rs            | 496   | +56  |
+----------------------------------------------------+-------+------+
| ethrex/crates/l2/networking/rpc/l2/batch.rs        | 86    | +86  |
+----------------------------------------------------+-------+------+
| ethrex/crates/l2/networking/rpc/l2/mod.rs          | 3     | +1   |
+----------------------------------------------------+-------+------+
| ethrex/crates/l2/networking/rpc/rpc.rs             | 191   | +2   |
+----------------------------------------------------+-------+------+
| ethrex/crates/l2/sequencer/l1_committer.rs         | 550   | +6   |
+----------------------------------------------------+-------+------+
| ethrex/crates/l2/sequencer/l1_proof_sender.rs      | 320   | +4   |
+----------------------------------------------------+-------+------+
| ethrex/crates/l2/sequencer/l1_proof_verifier.rs    | 272   | +6   |
+----------------------------------------------------+-------+------+
| ethrex/crates/l2/storage/src/api.rs                | 114   | +18  |
+----------------------------------------------------+-------+------+
| ethrex/crates/l2/storage/src/store.rs              | 347   | +41  |
+----------------------------------------------------+-------+------+
| ethrex/crates/l2/storage/src/store_db/in_memory.rs | 271   | +30  |
+----------------------------------------------------+-------+------+
| ethrex/crates/l2/storage/src/store_db/libmdbx.rs   | 388   | +42  |
+----------------------------------------------------+-------+------+
| ethrex/crates/l2/storage/src/store_db/redb.rs      | 387   | +38  |
+----------------------------------------------------+-------+------+
| ethrex/crates/l2/storage/src/store_db/sql.rs       | 580   | +56  |
+----------------------------------------------------+-------+------+

**Description** This PR fixes a panic we had when the user didn't specify any of the `proof-coordinator.*` flags. It seems clap called the `Default::default` implementation, which panicked because of the parsing not having support for leading `0x`. Closes #3309

**Description** This PR updates the withdrawals documentation with native ERC20 withdrawals and adds documentation for L2 deposits. --------- Co-authored-by: Javier Rodríguez Chatruc <[email protected]> Co-authored-by: Avila Gastón <[email protected]> Co-authored-by: Copilot <[email protected]>

**Motivation** https://docs.ethrex.xyz/, isn't rendering LaTex expression **Description** This PR adds the [mdbook-katex](https://github.com/lzanini/mdbook-katex) preprocessor to `book.toml` to enable LaTeX rendering. Run the following command to check how the documentation looks ```bash make docs-deps && make docs-serve ``` **Before** ![image](https://github.com/user-attachments/assets/393cf3f8-bd4a-455a-bba0-4e46cc4e42f0) **After** ![image](https://github.com/user-attachments/assets/8e6954ad-9050-4161-ada2-2f3d0e13a804)

**Motivation** In #3242, `verifyBatchesAligned()` was updated in the based `OnChainProposer` to be consistent with the non-based one, but the `onlySequencer` identifier was added by mistake. **Description** Removes the `onlySequencer` identifier. Closes None

Copilot

Pull Request Overview

This PR implements storage and retrieval of commit and verify transaction hashes for L2 batches, and exposes them via a new ethrex_getBatchByNumber RPC endpoint. Key changes include:

Extending the Batch struct with commit_tx and verify_tx and updating all storage backends (SQL, Redb, LMDBX, in-memory) to persist these.
Capturing and storing verify transaction logs in the block fetcher and sequencer modules.
Adding a new RPC handler for ethrex_getBatchByNumber that returns the enriched Batch data.

Reviewed Changes

Copilot reviewed 15 out of 15 changed files in this pull request and generated 2 comments.

Show a summary per file

File	Description
crates/l2/storage/src/store_db/sql.rs	Added `commit_txs`/`verify_txs` tables and SQLStore methods
crates/l2/storage/src/store_db/redb.rs	Added Redb tables and methods for commit/verify TXs
crates/l2/storage/src/store_db/libmdbx.rs	Added LMDBX tables and methods for commit/verify TXs
crates/l2/storage/src/store_db/in_memory.rs	Extended in-memory store with commit/verify TX maps
crates/l2/storage/src/store.rs	Piped new methods into the `Store` API and `get_batch` logic
crates/l2/storage/src/api.rs	Extended `StoreEngineRollup` trait with commit/verify TX methods
crates/l2/sequencer/l1_proof_verifier.rs	Storing verify TX hashes for aggregated proofs
crates/l2/sequencer/l1_proof_sender.rs	Storing verify TX after sending proof
crates/l2/sequencer/l1_committer.rs	Storing commit TX after batch commitment
crates/l2/networking/rpc/rpc.rs	Routed `ethrex_getBatchByNumber` method
crates/l2/networking/rpc/l2/batch.rs	Implemented RPC objects and handler for batch endpoint
crates/l2/based/block_fetcher.rs	Fetching/verifying logs and storing both TX hashes; refactored fetching logic
crates/common/types/batch.rs	Made `Batch` serializable and added new fields

Comments suppressed due to low confidence (3)

crates/l2/networking/rpc/rpc.rs:211

Add unit or integration tests for the new ethrex_getBatchByNumber RPC endpoint to verify that commit_tx and verify_tx fields are correctly returned in various scenarios.

        "ethrex_getBatchByNumber" => GetBatchByBatchNumberRequest::call(req, context).await,

crates/common/types/batch.rs:18

[nitpick] Consider annotating commit_tx and verify_tx with #[serde(skip_serializing_if = "Option::is_none")] so that null values are omitted from JSON when not set.

    pub verify_tx: Option<H256>,

crates/l2/storage/src/store_db/in_memory.rs:42

Ensure that commit_txs and verify_txs are initialized when constructing StoreInner (e.g., in its new or Default impl) so they don't remain uninitialized at runtime.

    commit_txs: HashMap<u64, H256>,

crates/l2/storage/src/store_db/sql.rs

ilitteri

It'd be nice to implement the new method in the EthClient

crates/l2/networking/rpc/l2/batch.rs

avilagaston9 · 2025-07-01T16:13:23Z

It'd be nice to implement the new method in the EthClient
@ilitteri

Created #3422

fkrause98 · 2025-07-01T21:50:37Z

crates/l2/based/block_fetcher.rs

+    state: &mut BlockFetcherState,
+    last_l2_batch_number_known: u64,
+) -> Result<(), BlockFetcherError> {
+    let mut missing_batches_logs =


Consider returning a BTreeMap<BatchNumber, Log> instead of a Vec with tuples if possible. This will save us the call to sorting here.

This part is simply a refactor to also process verified_logs. I just copied and pasted what was done before. We can review this in the future.

fkrause98 · 2025-07-01T22:00:22Z

crates/l2/networking/rpc/l2/batch.rs

+    #[serde(flatten)]
+    pub batch: Batch,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub block_hashes: Option<Vec<BlockHash>>,


If block hashes can be none, why not simply use an empty vec?

The block_hashes field is optional. You can choose whether to request them using a boolean parameter, similar to this. IMO, an empty vec could indicate that the batch is empty.

fkrause98 · 2025-07-01T22:04:09Z

crates/l2/sequencer/l1_proof_verifier.rs

+        // Store the verify transaction hash for each batch that was aggregated.
+        for i in 0..aggregated_proofs_count {
+            let batch_number = first_batch_number + i;
+            self.rollup_store
+                .store_verify_tx_by_batch(batch_number, verify_tx_hash)
+                .await?;
+        }
+
        Ok(Some(verify_tx_hash))


It would be better to create a function that takes a range of batch numbers and stores them all in a single transaction

Created #3432!

**Motivation** For debugging purposes, it's useful to have an `ethrex_getBatchByNumber` endpoint that returns a `Batch` struct: ```Rust pub struct Batch { pub number: u64, pub first_block: u64, pub last_block: u64, pub state_root: H256, pub deposit_logs_hash: H256, pub message_hashes: Vec<H256>, pub blobs_bundle: BlobsBundle, pub commit_tx: Option<H256>, pub verify_tx: Option<H256>, } ``` **Description** - Modifies the `Batch` struct to incude `commit_tx` and `verify_tx`. - Updates `block_fetcher` to process verify tx logs and extract the verify tx hashes as well. - Fixes a bug found during development: the `rollup_storage::getBatch()` function incorrectly treated batches without `L1Messages` as an error. ## How to test You can run: ```bash curl -X POST http://localhost:1729 \ -H "Content-Type: application/json" \ -d '{ "jsonrpc":"2.0", "method":"ethrex_getBatchByNumber", "params": ["0x1", true], "id":1 }' ``` Closes None --------- Co-authored-by: Tomás Grüner <[email protected]> Co-authored-by: Javier Rodríguez Chatruc <[email protected]> Co-authored-by: Copilot <[email protected]> Co-authored-by: Damian Ramirez <[email protected]>

feat(l2): add commit and tx hashes to Batch

8635065

avilagaston9 self-assigned this Jun 27, 2025

avilagaston9 added the L2 Rollup client label Jun 27, 2025

avilagaston9 and others added 19 commits June 27, 2025 17:58

Fix clippy

352d397

Merge branch 'main' into feat/l2/implement_batch_endpoint

cc7fa2e

Merge branch 'main' into feat/l2/implement_batch_endpoint

98a603c

Implement batch endpoint

f6fee06

Save verify tx in l1_proof_verifier

57a856a

finih endpoint implementation

c84e37e

Merge branch 'main' into feat/l2/implement_batch_endpoint

39feb9b

Fix merge

9291011

Make batch param a string hex

fadee23

fix(l2): based CI (#3404)

1a8cf99

**Motivation** In #3242, `verifyBatchesAligned()` was updated in the based `OnChainProposer` to be consistent with the non-based one, but the `onlySequencer` identifier was added by mistake. **Description** Removes the `onlySequencer` identifier. Closes None

Merge branch 'main' into feat/l2/implement_batch_endpoint

de7d232

Add block hashes to rpc batch

3d912cf

Skip blobs bundle

2da451a

Merge branch 'main' into feat/l2/implement_batch_endpoint

fb87845

Fix clippy

8664cbb

Nit

b1eea4d

avilagaston9 marked this pull request as ready for review June 30, 2025 20:46

Copilot AI review requested due to automatic review settings June 30, 2025 20:46

avilagaston9 requested a review from a team as a code owner June 30, 2025 20:46

Copilot AI reviewed Jun 30, 2025

View reviewed changes

crates/l2/storage/src/store_db/sql.rs Outdated Show resolved Hide resolved

crates/l2/storage/src/store_db/sql.rs Outdated Show resolved Hide resolved

Address comments

73a57a5

ilitteri approved these changes Jul 1, 2025

View reviewed changes

crates/l2/networking/rpc/l2/batch.rs Outdated Show resolved Hide resolved

refactor: use ok_or()

45563b3

avilagaston9 mentioned this pull request Jul 1, 2025

L2: implement get_batch_by_number in EthClient #3422

Closed

ilitteri enabled auto-merge July 1, 2025 21:39

fkrause98 reviewed Jul 1, 2025

View reviewed changes

MegaRedHand added this to ethrex_l2 Jul 1, 2025

MegaRedHand moved this to In Review in ethrex_l2 Jul 1, 2025

fkrause98 approved these changes Jul 1, 2025

View reviewed changes

ilitteri added this pull request to the merge queue Jul 1, 2025

Merged via the queue into main with commit 8c1812c Jul 1, 2025
45 of 60 checks passed

ilitteri deleted the feat/l2/implement_batch_endpoint branch July 1, 2025 22:22

github-project-automation bot moved this from In Review to Done in ethrex_l2 Jul 1, 2025

avilagaston9 mentioned this pull request Jul 1, 2025

L2: store batch verify transaction hashes in a single database transaction #3432

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

feat(l2): implement batch endpoint #3374

feat(l2): implement batch endpoint #3374

Uh oh!

avilagaston9 commented Jun 27, 2025 •

edited

Loading

Uh oh!

github-actions bot commented Jun 27, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Uh oh!

Uh oh!

ilitteri left a comment

Uh oh!

Uh oh!

avilagaston9 commented Jul 1, 2025

Uh oh!

fkrause98 Jul 1, 2025

Uh oh!

avilagaston9 Jul 1, 2025

Uh oh!

fkrause98 Jul 1, 2025

Uh oh!

avilagaston9 Jul 1, 2025

Uh oh!

fkrause98 Jul 1, 2025

Uh oh!

avilagaston9 Jul 1, 2025

Uh oh!

Uh oh!

Uh oh!

feat(l2): implement batch endpoint #3374

feat(l2): implement batch endpoint #3374

Uh oh!

Conversation

avilagaston9 commented Jun 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

How to test

Uh oh!

github-actions bot commented Jun 27, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Lines of code report

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

Uh oh!

Uh oh!

ilitteri left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

avilagaston9 commented Jul 1, 2025

Uh oh!

fkrause98 Jul 1, 2025

Choose a reason for hiding this comment

Uh oh!

avilagaston9 Jul 1, 2025

Choose a reason for hiding this comment

Uh oh!

fkrause98 Jul 1, 2025

Choose a reason for hiding this comment

Uh oh!

avilagaston9 Jul 1, 2025

Choose a reason for hiding this comment

Uh oh!

fkrause98 Jul 1, 2025

Choose a reason for hiding this comment

Uh oh!

avilagaston9 Jul 1, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

avilagaston9 commented Jun 27, 2025 •

edited

Loading

github-actions bot commented Jun 27, 2025 •

edited

Loading